From bab906f83846f96b407510e42cf21c281e492451 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sun, 24 Jul 2016 19:11:27 +0200 Subject: [PATCH] Adwaita: use margins for entry image spacing there used to be a padding, since it was the only option in the past, that makes little sense now, hence use margins. --- gtk/theme/Adwaita/_common.scss | 4 ++-- gtk/theme/Adwaita/gtk-contained-dark.css | 6 ++---- gtk/theme/Adwaita/gtk-contained.css | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 1b1868a254..58a320c511 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -254,8 +254,8 @@ entry { @include entry(normal); image { // icons inside the entry - &.left { padding-left: 0; padding-right: 6px; } - &.right { padding-left: 6px; padding-right: 0; } + &.left { margin-right: 6px; } + &.right { margin-left: 6px; } } undershoot { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 2172f95534..76801c7947 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -171,12 +171,10 @@ entry { box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); } spinbutton:not(.vertical) image.left, entry image.left { - padding-left: 0; - padding-right: 6px; } + margin-right: 6px; } spinbutton:not(.vertical) image.right, entry image.right { - padding-left: 6px; - padding-right: 0; } + margin-left: 6px; } spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 6aff4cf3c5..1e71d62509 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -171,12 +171,10 @@ entry { box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); } spinbutton:not(.vertical) image.left, entry image.left { - padding-left: 0; - padding-right: 6px; } + margin-right: 6px; } spinbutton:not(.vertical) image.right, entry image.right { - padding-left: 6px; - padding-right: 0; } + margin-left: 6px; } spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent; -- 2.30.2